projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f553016 c5d56bf)
Backport fix for Bug#2423 from trunk.
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Thu, 4 Nov 2010 19:39:47 +0000 (15:39 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Thu, 4 Nov 2010 19:39:47 +0000 (15:39 -0400)
commit14b6e42ad84246a389895657dcd40f67f10d8065
tree81a328a54e7c75a87217aabab83052586db464c9tree | snapshot
parentf553016861a0810d9f786d5ee9b6ffe98523f5edcommit | diff
parentc5d56bfcec77f7a532e6bb2eba2cfa2573085e1ccommit | diff
Backport fix for Bug#2423 from trunk.

* dispextern.h (TRY_WINDOW_CHECK_MARGINS)
(TRY_WINDOW_IGNORE_FONTS_CHANGE): New defines.

* xdisp.c (try_window): Change arg from CHECK_MARGINS to FLAGS.
Don't abort with fonts change if TRY_WINDOW_IGNORE_FONTS_CHANGE is
set in FLAGS.  Callers with non-zero CHECK_MARGINS changed to use
TRY_WINDOW_CHECK_MARGINS.

* xfns.c (Fx_show_tip): Undo last change.  Call try_window with
TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423).
src/ChangeLog diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.